projects
/
emacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
24acbc3
)
* callproc.c (init_callproc): Fix bug introduced at 2014-09-07.
author
Jan Djärv
<jan.h.d@swipnet.se>
Sun, 14 Sep 2014 08:23:48 +0000
(10:23 +0200)
committer
Jan Djärv
<jan.h.d@swipnet.se>
Sun, 14 Sep 2014 08:23:48 +0000
(10:23 +0200)
Fixes: debbugs:18474
src/ChangeLog
patch
|
blob
|
history
src/callproc.c
patch
|
blob
|
history
diff --git
a/src/ChangeLog
b/src/ChangeLog
index cb3aa8c7fe33c0a3185b848ad6aa93ac754a5028..015ed3618cf4f0bc6edeea7c089e84d4ea5a3f14 100644
(file)
--- a/
src/ChangeLog
+++ b/
src/ChangeLog
@@
-1,3
+1,8
@@
+2014-09-14 Jan Djärv <jan.h.d@swipnet.se>
+
+ * callproc.c (init_callproc): Fix bug introduced at
+ 2014-09-07 (Bug#18474).
+
2014-09-13 Dmitry Antipov <dmantipov@yandex.ru>
Prefer ptrdiff_t to int and avoid integer overflows.
diff --git
a/src/callproc.c
b/src/callproc.c
index c864471f504b24521a15411558b96b00c2c3f26c..798f441bdefd95c86c3ee3fe573639e518b02056 100644
(file)
--- a/
src/callproc.c
+++ b/
src/callproc.c
@@
-1579,7
+1579,7
@@
init_callproc (void)
Lisp_Object tempdir;
#ifdef HAVE_NS
if (data_dir == 0)
- data_dir =
=
ns_etc_directory () != 0;
+ data_dir = ns_etc_directory () != 0;
#endif
if (!NILP (Vinstallation_directory))